Upgrade nokogiri to 1.6.4, which comes with security fixes.

Akinori MUSHA 10 years ago
parent
commit
670163b00f
2 changed files with 5 additions and 5 deletions
  1. 1 1
      Gemfile
  2. 4 4
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -70,7 +70,7 @@ gem 'kramdown', '~> 1.3.3'
70 70
 gem 'liquid', '~> 2.6.1'
71 71
 gem 'mysql2', '~> 0.3.16'
72 72
 gem 'multi_xml'
73
-gem 'nokogiri', '~> 1.6.1'
73
+gem 'nokogiri', '~> 1.6.4'
74 74
 gem 'omniauth'
75 75
 gem 'rails' , '~> 4.1.7'
76 76
 gem 'rufus-scheduler', '~> 3.0.8', require: false

+ 4 - 4
Gemfile.lock

@@ -211,7 +211,7 @@ GEM
211 211
       thread_safe (~> 0.3, >= 0.3.1)
212 212
     method_source (0.8.2)
213 213
     mime-types (1.25.1)
214
-    mini_portile (0.6.0)
214
+    mini_portile (0.6.1)
215 215
     minitest (5.4.0)
216 216
     mqtt (0.3.1)
217 217
     multi_json (1.10.1)
@@ -220,8 +220,8 @@ GEM
220 220
     mysql2 (0.3.16)
221 221
     naught (1.0.0)
222 222
     net-ftp-list (3.2.8)
223
-    nokogiri (1.6.3.1)
224
-      mini_portile (= 0.6.0)
223
+    nokogiri (1.6.4)
224
+      mini_portile (~> 0.6.0)
225 225
     oauth (0.4.7)
226 226
     oauth2 (0.9.4)
227 227
       faraday (>= 0.8, < 0.10)
@@ -485,7 +485,7 @@ DEPENDENCIES
485 485
   multi_xml
486 486
   mysql2 (~> 0.3.16)
487 487
   net-ftp-list (~> 3.2.8)
488
-  nokogiri (~> 1.6.1)
488
+  nokogiri (~> 1.6.4)
489 489
   omniauth
490 490
   omniauth-37signals
491 491
   omniauth-dropbox